Variou bug updates and additions