YaY, i made some mistakes. feel free to commit! =]