Fixed the last stuff before hand-in