Few small fixes


I've plugged some memory leaks and fixed empty-looking menu items.

Mostly I'm just testing githubs pull requests :)