Minor fixes, fully working project template