Develop

major fixes and design updates.