bug fix, tweaks and gamerid's