a bit additions and fixes