Small updates and added utility scripts