Main includes the new classes

1. Also fixed syntax bug in Point.