Beta0.4 - Comments

Done did some comment restructuring