Proto beta 2

All known bugs are fixed