need to actually mount it
a few fixes and improvements