fixed up more issues :)