Cleaned up a bit, edited documentation