fixed bugs, everything seems to be working fine, thus far