Bug fixes, added temp process