Bugfixes, HashMap fixed, Argument fixes

Signed-off-by: DreTaX <dretax14@gmail.com>