small fixes before I crash everything