- more warning & cosmetic fixes