Fixing issues (WIP)
merge again