Finally got through these bugs!