diff --git a/craftbukkit b/craftbukkit
index bd9ccba..b8f784b 100644
--- a/craftbukkit
+++ b/craftbukkit
@@ -12,15 +12,14 @@
 # @TODO
 # - Implement restart
 # - Implement status
-# - Evaluate commandline options
 
 # Config START
 USER="craftbukkit"
 SRVPATH="/opt/craftbukkit"
 WORLDPATH="/opt/craftbukkit/world/"
-LOGPATH="/opt/craftbukkit/log/server.log"
-JAVAOPTS="-d64 -server -Xms1G -Xmx1G -XX:+UseG1GC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseLargePages -XX:TargetSurvivorRatio=90 -XX:MaxGCPauseMillis=200 -XX:MaxPermSize=256m"
+JAVAOPTS="-d64 -server -Xms1G -Xmx4G -XX:+UseG1GC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:TargetSurvivorRatio=90 -XX:MaxGCPauseMillis=200 -XX:MaxPermSize=256m -Dlog4j.configurationFile=bukkit-log.xml"
 JARNAME="craftbukkit.jar"
+JAROPTS="--universe ${WORLDPATH}"
 # Config END
 
 # We want LSB functions here