Upgraded L4 Version and Fixed Accordingly

If you feel compelled to merge, look through these carefully first.