Improvements I personally wanted