small fixes - 20 minutes. will have more time this weekend