update
merge
fixed firefox bug (i think).. was not seeing the function right beside it.. lame firefox
driving me crazy with this file