Beta_2.1

Updates and fixes.