Fix some issues. Still not working :/