Fixed syntax, style. Added a few methods and c-tors.