Cleaned up files, updated libraries