Alpha 4

Some control improvements