Some updates and house keeping