initial bugs fixed