added a few helpful tweaks