Infrastructure updates

Resolves #189 
Resolves #171 
Resolves #151