Revert "new features, fixes"

This reverts commit d5ed3c3ae800b10bbeebdcf534ef6ac24fd8d424.