Implemented basic suggestions