Various tweaks and updatings