Details and bugfixing