Some bugs fixed many created