add some bugs that I forgot to fix on my github :S