Fixed tabbing, added javadocs