Credit system working and fixed some issues