Updated code again
Added other interesting goodies!