- Issue fixes!

- Fixed some bugs that were lying around
- Added all bootstrap vars to copy accross