Add proper info and credits (not done yet)