working now
small fixes