Improved scope management, created constructors to control flow of initialization
Fixed some initial values