fixed initial bugs