Some minor tweaks. Next version will feature a different framework