fixed some minor standalone bugs