minor fixes an visual enhancements