Exploit fixed, minor changes