Bugfix

Little changes to ease development.