random fixes and additions