updates and a few changes to improve the system