Revert "various improvements / fixes"