Minor Additions

Added more to Parser