Added credits.. and a few more fixes