removing misc issues with @@