mixed fix
getting last things working