major shit fixes