Tweaked some classs and added some classs