Heavy updates fixing a lot of bugs.