diff --git a/java8.md b/java8.md
index 9eaae17..d87ab9e 100644
--- a/java8.md
+++ b/java8.md
@@ -1,6 +1,7 @@
 # Java
 
 Install Java programming language to user .local directory using [AdoptOpenJDK](https://adoptopenjdk.net/) distribution.
+Optionally, also set up [Maven](https://downloads.apache.org/maven/maven-3/) and [Gradle](https://services.gradle.org/distributions/) for building artifacts.
 
 ## Remove old version before installation
 
@@ -13,7 +14,7 @@ rm -rf $HOME/.local/openjdk-8 $HOME/.local/maven-3 $HOME/.local/gradle
 ```bash
 wget -qO openjdk-8.tar.gz "https://api.adoptopenjdk.net/v3/binary/latest/8/ga/linux/x64/jdk/hotspot/normal/openjdk?project=jdk" \
   && tar -C $HOME/.local -xzf openjdk-8.tar.gz \
-  && mv $HOME/.local/openjdk-8* $HOME/.local/openjdk-8 \
+  && mv $HOME/.local/openjdk-8u* $HOME/.local/openjdk-8 \
   && rm openjdk-8.tar.gz
 
 
@@ -24,10 +25,10 @@ wget -qO maven-3.tar.gz "https://downloads.apache.org/maven/maven-3/${MVN_VERSIO
   && rm maven-3.tar.gz
 
 GRDL_VERSION=
-wget -qO gradle.tar.gz "https://services.gradle.org/distributions/gradle-${GRDL_VERSION}-bin.zip" \
-  && unzip -qq -d $HOME/.local gradle.tar.gz
+wget -qO gradle.zip "https://services.gradle.org/distributions/gradle-${GRDL_VERSION}-bin.zip" \
+  && unzip -qq -d $HOME/.local gradle.zip \
   && mv $HOME/.local/gradle-${GRDL_VERSION} $HOME/.local/gradle \
-  && rm gradle.tar.gz
+  && rm gradle.zip
 ```
 
 ## Set up environment variables
@@ -36,7 +37,7 @@ wget -qO gradle.tar.gz "https://services.gradle.org/distributions/gradle-${GRDL_
 cat << EOF >> $HOME/.bashrc
 # java 8, maven, gradle
 export JAVA_HOME=\$HOME/.local/openjdk-8
-export PATH=\$PATH:$JAVA_HOME/bin:\$HOME/.local/maven-3/bin:\$HOME/.local/gradle/bin
+export PATH=\$PATH:\$JAVA_HOME/bin:\$HOME/.local/maven-3/bin:\$HOME/.local/gradle/bin
 EOF
 ```