Added Notes, fixed serveral bugs