tweaked and killed a few bugs.waiting for design