#1440 Specs (not finished but working) + related bugfixes