Bug fixes and contrast-control added