fixing alex's bugs all night