Issues solving - part 1

This PR addresses parts of the issue list. There a still many to come...