Added str functions, fixed syntax error, added REVIEW comment where needed