cleaned up junk and fixed to work on apache w/ windows