Working on tweeks and documentation