Small implementation changes

Fixed small bugs needed to install on another computer