fixed warnings
various fixes to class references