Many little bug fixed