Added more to expr statemnts etc in parser