fixed ridiciulous mistakes
fix
done!
merged master