fixed a few nagging problems