Fixes and other tweaks and stuff