some classes added, some fixes fixed