FIXED: various fixes