Tons of bug fixes and little features towards COB