added str and octstr concatenation, fixed some bugs