Fixed some issues (WIP)