meh...bugs fixed