Update Improvements

Work on #11, #13 and #14