a few more tweaks and what nots