A couple of bug fixes and FS icon added