fixed 'useful' merge, added prefix to the classes, small fixes