Trying to get little bugs fixed