added features, removed unused module, small cleanup