final changes, added problem set to mix, fixing bugs and testing later