Improved, better docs, fixed some bugs