Added a few hints for future use