fixed misc issues