Add comments, clean up, layout fix