cleaned up installer and builder