Fixed sticky/comment bug; cleaned up output