Restore monitor, cleanup leftovers, improve state, fix ps