small fixes and first imports