a few misc things. this ticket changed after client meeting