Added build-prod task
Added more improvements