Silvia

Some further updates and cleanup.