Added the separator property, updated parse methods, added comments and
updated some constant values