finishing touches, bug fixing