fixed more things, hash still wrong