Still a few bugs