more tweaks and finsihed major design