more bugfixing
calibra