Plenty of bug fixes / features