- fixed more issues