fixed a few issues and continue minor styling