Fixed, additions and todos