Update some fixes and design issues