fix weird loading animation and cleanup