Did some bugfixin'