added appointment class and some minor changes