Some Shoestrap files
small bugfixes