Added feature, fixed some issues