f451

few tweaks, fixed bug