Bosco fixes and many more!