Edited + fixed stuff