Revised and updated parameters, several fixes, advanced parameters