fixing all kinda stuff, so ready for branch back