small fixes, continuous work