fixes, added colors