fixed bibliography and continued implementing Jun's edits