fix n00b bugs