Added more comments, started changing parsing of machine options