Bug fixes. First milestone complete.