small fixes and cool stuff