Improve fighting the rest

some commits I didn't upload to #301