bug fixes

Squashed bugs with hash parsing - added fault tolerance