Making some hive improvements