A lot more bug fixes...