small fixes, incoming big changes