fixed basic errors