Updated docs and fixed broken main methods