Minor Bug Fixes

Changed the constructor a little bit.