FINALLY fixed all apparent start/stop issues. With master anyway