Fixed some bugs, comment a bit...