Various fixes, moves, refactorings an additions