Design fixes and added kudosplease @TimPietrusky