fix major things