minor tweaks
Added future features