final tweaks and stuff