Bug fixes and user friendlyness