Fixed the First Two bugs