make fields private, comments
fix local variable offsets