Major tweaks and design changes