Blackhole added and other fixes