fixed bugs, have more bugs, the usual