Update

Just some bug fixes and so forth