Adding startup and small fixes