starting small fixes
Merged with smallfixes