updates and tweaks improved interface