Completed fixing conventions, thngs work as before