Added a couple variable types and added instance assertions to scope setters