added small fixes and some TODO after initial testing