- A lot of fixes & additions