fixed bugs and added kvitering