all bugs fixed, console log removed