Closer to beta

Widdling down features and bugs