Fix issues 18 ~ 23

@CyberSecutor