Fixes

> Fixed most of the broken code
> Added multiple critical points
> Added objects