Basic bug fixes and add convert legacy behaviour

Convert old behaviour files