fixed smaller problems

still much work left to do :P