Removed deprecated bits, upgraded some versions, fixed minor bugs