bugs fixed
removed useless stuff