fixes & started work on sneak
fixed merge