started work on re-load fixes