Leaving rest for tomorrow, fixes and Project wizard