v3: cleanup

this and that and minor changes :cool: