fixes and further class merging