Some cleanup + making things work