buggs fixed