remove fixed bugs, add couple new ones