Adding buildService as default task and some other minor adjustments