Added double-dot protection. Added more controls.