Improvements, stabilizing intereface, added some docs