Debugging abilities, many fixes