Various fixes, added angular etc