Bug fixes, added a manual