Updated comments
Added some new classes