fixed stoopid bugs