Some Calculator bug fixes And BookStoreAdded