fixed a few things...