Lots of fixes in here, getting more and more stable by the day...

Comments