fixes, simplifications