solving a few issues...