Fixed a few bugs
dur