misc
cleanup, initial broken history