Stuff
Fixed a few bugs
merge fixValkyrie