More functions + fix