Hopefully fixed the JSPs... I'm gonna commit more now.