v1.5 beta

Updated to use MS Options framework
Updated to use latest EDDRI
Works on MS
Various bugfixes