Finishing touches and final bugfixes