Enough changes to get trivial example working

- Added quantifiers where necessary
- Fixed small bugs here and there