code formatting
fix
service handling cleanup
launch fix