parsing fixes and returns