Update at 24th of January 2014 - 17:00

Fixed some mini bugs - but not the real one :(