fixed a few issues caught by vet