Added angular and fixed up versions