fixed a few... problems...