Made close-to-final adjustments. Change versioning system to version < 1 since this is beta it makes more sense.