fix known bugs