Performed additional bug fixes for standalone jar.