Bugfixes related to aspects and general life cycle issues. Committed so others can test against this version.