minor improvements, preparing for deployment