Add more claw functions, remove uneeded variables
Fix git
Conflicts:
	main.c