better unit information and a bugfix or two