Fixed initial bugs