Added constraints, finished some TODOs, working on documentation