Several updates and improvments