Changed random things
added asserts