upped blueprints version; worked through some TODOs