Details and bugfixing (#104 tested)