MOD: code clean up
MOD: fixed prefix loading and added space after custom prefix