Updated comments
Added final where possible and fixed some java doc comments etc.