adding a bunch of little tweaks to functionality