fixes for bug fixes >.<