More improvements. Plus formatting. Also disclaimer