Fixes & updates & additions