Minor updates to make more useable/faster