Fixed angle parsing, added more inline docs