Started cleaning some stuff up, more to come

empty