GSoC updates and a few previous fixes