Re-arranged content and updated a few bugs.