[fixed] misc. small fixes and changes