Fixed TODO items
Added credits
Update