Fixed almost everything...