fixed MORE bugs..sorry