Development addition

More simplification and bug fixes. The commits usually have detailed messages, which may aid in understanding this.