color stuff, line changes, will make another commit later