Updates from my branch bringing everything up to 0.4.1