Updates and general cleanup