Variety of fixes and additions