Updated specs, cleaned up design