Fixing stuff, removed debug prints