comments, bugs, cleaning up