Updates and fixes. Works so far