BUGFIX: corrected some errors probably caused by c&p