Minor fixes and prepared a ready to go ZIP archive