More bug fixing
build for deploy