lots of fixing, need to clean up disconnected connection