Hotfix v0.5.1

Grill on Wheels

Minor bug fixes and improvements after milestone update