update to 2.0rc2 and clear obvious errors