More override functionality and general tidying up