various improvements additions and fixes