Fixed first few issues