FIXED TODOs, ADDED new classes (color and exceptions),
edit code