Fixed some issues and got to work on bulk change