fixing bugs

killing those bugs one at a time.