ERB_FRa.26 - Cleanup and Bug Fixes