still a few bugs left