New limit increased to 5000 and general cleanup