misc updates fixing issues from saturday work