Fixed issues and built jar