fixed few things