bugfixes and compliance with newest Concrete spec