Some updates and additons