Cleaned stuff, added better doc