Fixed issues
ready to push