many fixes and new names