added setup script
changed var names (consistency)