adding acknowledgement and fixing todos