few more updates and fixes!!