fix initial bugs