cleanup + a bit of docs