Altered some comments, added some TODOs, e.g. error handling
Renamed uniform typecheck macro