fixed an annoying bug… code seriously need a do over...