* Removed workaround code (now normalized values: [0,1])
* Pending: marker sync issue (see previous commit)