Some changes to make it more like the working version
Return to practical settings
Soem minor weaks