Small Improvements

Taken from my work on an in progress module