updated a lot of files. stabalized color collision and added asserts