fixed features, added bugs
"trying to fix this"
Conflicts:
	miner.py