Bugfix update

- Added minor functionality
- Made a few broken things work more as anticipated

Change-Id: Ib2424cf12a7ce37d38f6b211a5a6d7545c46d7a4