Added more comments, unified string syntax