Added bugfixs and credits