Fixed Project Setup,
Bugfixes..