FINAL COMMIT - minor updates