Fixed issues, hopefully