Feature/cleanup2

general stuff that didnt deserve its own branch