Added assembly project and fix some issues with build