lots of changes: preparing for 0.5.0