Fix refresh bug. Other misc changes. Version 1.2.3