Fixed serveral problems and bugs ;)