Bug still in, some updates to the interface