Fixed a few small details and now file removal works too