fixes'n'adjastments