implemented adding to process queue
merged files
fixed some various errors